From 2b125d22847e6ae58c3f86fba0dceec575b557aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 Jun 2006 17:40:43 +0000 Subject: [PATCH] Avoid a near-duplicate string. (#345320, Hendrik Richter) 2006-06-19 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_add_shortcut_folder): Avoid a near-duplicate string. (#345320, Hendrik Richter) --- ChangeLog | 14 +++++++++++++- ChangeLog.pre-2-10 | 14 +++++++++++++- gtk/gtkfilechooserdefault.c | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62216fecae..954eebb62e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-19 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_add_shortcut_folder): + Avoid a near-duplicate string. (#345320, Hendrik Richter) + 2006-06-19 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder) @@ -15,8 +20,15 @@ 2006-06-19 Matthias Clasen + * gtk/gtk.symbols: Add new functions + + * gtk/gtkprinter.h: + * gtk/gtkprinter.c (gtk_enumerate_printers): New function + to list all printers (#344074, Felipe Heidrich) + * gtk/gtkprinter-private.h: - * gtk/gtkprinter.c (_gtk_printer_get_options): + * gtk/gtkprinter.c (_gtk_printer_get_options) + * gtk/gtkprintbackend.h: Add a capabilities argument to the printer_get_options method and to the _gtk_printer_get_options function diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 62216fecae..954eebb62e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-06-19 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_add_shortcut_folder): + Avoid a near-duplicate string. (#345320, Hendrik Richter) + 2006-06-19 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder) @@ -15,8 +20,15 @@ 2006-06-19 Matthias Clasen + * gtk/gtk.symbols: Add new functions + + * gtk/gtkprinter.h: + * gtk/gtkprinter.c (gtk_enumerate_printers): New function + to list all printers (#344074, Felipe Heidrich) + * gtk/gtkprinter-private.h: - * gtk/gtkprinter.c (_gtk_printer_get_options): + * gtk/gtkprinter.c (_gtk_printer_get_options) + * gtk/gtkprintbackend.h: Add a capabilities argument to the printer_get_options method and to the _gtk_printer_get_options function diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index f57778931a..9e0a9aa1af 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -6786,7 +6786,7 @@ gtk_file_chooser_default_add_shortcut_folder (GtkFileChooser *chooser, g_set_error (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS, - _("shortcut %s already exists"), + _("Shortcut %s already exists"), uri); g_free (uri); -- 2.30.2